Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

diff --cc configure.ac
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xwidget.c
Simple merge